From cba6a1f885d1e357fa92d36312dbc760b507082f Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Fri, 8 Apr 2011 22:50:51 -0500 Subject: [PATCH] Fix a tty-related preprocessor inclusion error affecting GNU/Hurd systems. A problem with the preprocessor defines in src/term.c has been fixed. This problem would cause Emacs to fail on GNU/Hurd systems as follows: $ emacs -nw emacs: Not a tty device: /dev/tty Author: Samuel Thibault Date: Thu, 20 Jan 2011 02:17:24 +0100 Applied-By: Rob Browning Forwarded: bug-gnu-emacs@gnu.org Closes: #610576 --- src/term.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/term.c b/src/term.c index 6d16a65674b..44e127e7154 100644 --- a/src/term.c +++ b/src/term.c @@ -3413,13 +3413,12 @@ init_tty (char *name, char *terminal_type, int must_succeed) if we don't have one at the moment. */ fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0); else -#else +#endif /* O_IGNORE_CTTY */ /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only defined on Hurd. On other systems, we need to explicitly dissociate ourselves from the controlling tty when we want to open a frame on the same terminal. */ fd = emacs_open (name, O_RDWR | O_NOCTTY, 0); -#endif /* O_IGNORE_CTTY */ tty->name = xstrdup (name); terminal->name = xstrdup (name); -- 2.30.2